From ec500422285810149fca934c300dc25dd279ef6f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 19 Mar 2016 18:57:33 +0100 Subject: [PATCH] Revert "Adwaita: checkbutton and radiobutton backdrop color fix" This reverts commit 43937c6aa0bc0966f4bb0518c443a3f212c9d300. Which was needed since the label styling was broken. --- gtk/theme/Adwaita/_common.scss | 2 -- gtk/theme/Adwaita/gtk-contained-dark.css | 2 -- gtk/theme/Adwaita/gtk-contained.css | 2 -- 3 files changed, 6 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 0052a585ac..e2d4d372c4 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2505,8 +2505,6 @@ checkbutton.text-button, radiobutton.text-button { &:last-child { margin-right: 4px; } } - &:backdrop { color: $backdrop_fg_color; } - &:disabled { &:active, &:indeterminate, & { // set insensitive color, which is overriden otherwise diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index dfc30976c6..0e8259a461 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2522,8 +2522,6 @@ checkbutton.text-button, radiobutton.text-button { margin-left: 4px; } checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button label:not(:only-child):last-child { margin-right: 4px; } - checkbutton.text-button:backdrop, radiobutton.text-button:backdrop { - color: #949796; } checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, checkbutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled { color: #949796; } checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 0acfa23e26..2d9a81b939 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2546,8 +2546,6 @@ checkbutton.text-button, radiobutton.text-button { margin-left: 4px; } checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button label:not(:only-child):last-child { margin-right: 4px; } - checkbutton.text-button:backdrop, radiobutton.text-button:backdrop { - color: #8b8e8f; } checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, checkbutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled { color: #8b8e8f; } checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop { -- 2.30.2